From: Alan Mackenzie <acm@muc.de>
Date: Thu, 10 Mar 2016 11:46:36 +0000 (+0000)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~3381
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ae6dc08e0c5961cd10469eefb3c78f6e8c14158b;p=emacs.git

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---

ae6dc08e0c5961cd10469eefb3c78f6e8c14158b